Improve GtkEntry handling of invalid stock ids

Instead of silently showing no icon, show a "missing image"
icon, like GtkImage does in the same situation. Fixes bug 579590.

diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index a21e94f57fd1d72ed410e2231bd65f6c096cf1f0..5473143f720b9cabc6b2e366ff767667c6e48fbc 100644 (file)
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -6448,6 +6448,11 @@ gtk_entry_ensure_pixbuf (GtkEntry             *entry,
                                                   icon_info->stock_id,
                                                   GTK_ICON_SIZE_MENU,
                                                   NULL);
+      if (!icon_info->pixbuf)
+        icon_info->pixbuf = gtk_widget_render_icon (GTK_WIDGET (entry),
+                                                    GTK_STOCK_MISSING_IMAGE,
+                                                    GTK_ICON_SIZE_MENU,
+                                                    NULL);
       GTK_WIDGET_STATE (entry) = state;
       break;